Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 12 Feb 2010 15:35:37 +0000 (15:35 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 12 Feb 2010 15:35:37 +0000 (15:35 +0000)

Trivial merge